Revert "fixed: draw css background and borders"
authorMatthias Clasen <mclasen@redhat.com>
Mon, 3 Feb 2014 20:59:23 +0000 (15:59 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Mon, 3 Feb 2014 21:02:16 +0000 (16:02 -0500)
This reverts commit ba6128f8afc90bc32b45559f9c24964e78f6ff3d.

This change breaks emacs drawing entirely. Since GtkFixed is
somewhat of a legacy widget anyway, lets just not bother doing
this modernization there, at least for now.

gtk/gtkfixed.c

index 07665b2977cdc9b6473bdaba3f0e08cdcd4502a5..44b37f95b350a5469d34b2806483e02f94714069 100644 (file)
@@ -94,8 +94,6 @@ static void gtk_fixed_get_preferred_height (GtkWidget *widget,
                                             gint      *natural);
 static void gtk_fixed_size_allocate (GtkWidget        *widget,
                                      GtkAllocation    *allocation);
-static gboolean gtk_fixed_draw      (GtkWidget        *widget,
-                                     cairo_t          *cr);
 static void gtk_fixed_add           (GtkContainer     *container,
                                      GtkWidget        *widget);
 static void gtk_fixed_remove        (GtkContainer     *container,
@@ -132,7 +130,6 @@ gtk_fixed_class_init (GtkFixedClass *class)
   widget_class->get_preferred_width = gtk_fixed_get_preferred_width;
   widget_class->get_preferred_height = gtk_fixed_get_preferred_height;
   widget_class->size_allocate = gtk_fixed_size_allocate;
-  widget_class->draw = gtk_fixed_draw;
 
   container_class->add = gtk_fixed_add;
   container_class->remove = gtk_fixed_remove;
@@ -484,22 +481,6 @@ gtk_fixed_size_allocate (GtkWidget     *widget,
     }
 }
 
-static gboolean
-gtk_fixed_draw (GtkWidget *widget,
-                cairo_t   *cr)
-{
-  GtkStyleContext *context;
-  GtkAllocation alloc;
-
-  context = gtk_widget_get_style_context (widget);
-  gtk_widget_get_allocation (widget, &alloc);
-
-  gtk_render_background (context, cr, 0, 0, alloc.width, alloc.height);
-  gtk_render_frame (context, cr, 0, 0, alloc.width, alloc.height);
-
-  return GTK_WIDGET_CLASS (gtk_fixed_parent_class)->draw (widget, cr);
-}
-
 static void
 gtk_fixed_add (GtkContainer *container,
                GtkWidget    *widget)